From 8796acd7397c05e5b6ff5ae60154b67fa9aac727 Mon Sep 17 00:00:00 2001 From: "kaf24@labyrinth.cl.cam.ac.uk" Date: Tue, 28 Jan 2003 11:44:33 +0000 Subject: [PATCH] bitkeeper revision 1.15.2.2 (3e366d215hkWVtN4VomU_bD8cQZUxw) domain_page.h, domain_page.c: Fix map_domain_mem() bug --- xen-2.4.16/common/domain_page.c | 2 +- xen-2.4.16/include/asm-i386/domain_page.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen-2.4.16/common/domain_page.c b/xen-2.4.16/common/domain_page.c index 2e37b72c5c..927ba63ff1 100644 --- a/xen-2.4.16/common/domain_page.c +++ b/xen-2.4.16/common/domain_page.c @@ -51,7 +51,7 @@ void *map_domain_mem(unsigned long pa) if ( cache[idx] == 0 ) break; } - cache[idx] = (pa & PAGE_MASK) | PAGE_HYPERVISOR; + cache[idx] = (pa & PAGE_MASK) | __PAGE_HYPERVISOR; local_irq_restore(flags); diff --git a/xen-2.4.16/include/asm-i386/domain_page.h b/xen-2.4.16/include/asm-i386/domain_page.h index bae558c377..92fb261147 100644 --- a/xen-2.4.16/include/asm-i386/domain_page.h +++ b/xen-2.4.16/include/asm-i386/domain_page.h @@ -35,7 +35,7 @@ static inline void *map_domain_mem(unsigned long pa) (pa & ~PAGE_MASK)); if ( (*pent & PAGE_MASK) != (pfn << PAGE_SHIFT) ) { - *pent = (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR; + *pent = (pfn << PAGE_SHIFT) | __PAGE_HYPERVISOR; __flush_tlb_one(va); } return va; -- 2.30.2